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

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

Change-Id: I83f1a0fd6fba02c86012c55e569cb908f2ce0cd3