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

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

Change-Id: I3ff058c978fe571ea3fbdc442d1c447614b8a475