Merge "Fix CTS for updated Wear custom resolver UI" am: 9ec592f109 am: b1d19cf18f am: 1b21ea85e5 am: 56384ef11a

Original change: https://android-review.googlesource.com/c/platform/cts/+/1812376

Change-Id: I5996a8f53d958abfefdbac58dceb4d202d865d2d