Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38 am: b730743b40
am: 6171da90c5

Change-Id: I53abe3ff30d8d60389a429c837c230758af54d50