Merge "Fix CTS for updated Wear custom resolver UI" am: 9ec592f109 am: b1d19cf18f

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

Change-Id: Ica408e3e8384069399f293e7c27d9d7da32dab4e