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
Change-Id: Id6034b9e8711366d86325107341876dcfc88ba6a