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

Change-Id: I31c220c68e142cb15b7e6801a88a1aff853229b2