Merge "Updates watch face to use new support library classes. am: ddec2169 am: ede29bb6" into oc-dr1-dev-plus-aosp