Merge "Revert "Fix broken Ui automator resource"" into udc-dev am: 5676c3aafc am: bb13497892

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

Change-Id: Ib512aa579183efc8fa788b1c14368cdc05630bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>