Merge "Fix CTS for updated Wear custom resolver UI" into stage-aosp-sc-ts-dev am: 26df6f0a4d am: f7c07c8136

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

Change-Id: I093a767133dc085c67a80e6a93155d6aac905d3c