Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am: 07192ff60a
am: 4e830d259a

Change-Id: Iaaa3618b497ec0d547f83e3b5677fd322f7015b3