Merge "DO NOT MERGE Watchface sample: Accessibility: Fixed "unlabeled button" on linear navigation. am: 671a1871 am: 405f2516 am: b5e2fec7 -s ours" into oc-mr1-dev-plus-aosp