Merge "Updates watch face to use new support library classes. am: ddec2169...
Merge "Updates watch face to use new support library classes. am: ddec2169 am: ede29bb6" into oc-dr1-dev-plus-aosp am: 8d635236
am: 63de5992
Change-Id: Ied742860419cc358718b9a2104f759ea6f1e9fa1