Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f
am: f351a576ce

Change-Id: Ida6b81f4d87550503e6a77e7163c1c50ebe0e36a