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

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

Change-Id: Ieed9cad90887fbe281516fc3267f260416689e4f