Port over improvements from code lab to watch face.

Bug: 32214858
Change-Id: I506dcb6165d5397fd442d9c33e956fe85c4fe022
5 files changed