Merge "[Ravenwood] Recreate UiAutomation mocks for each test" into main am: d4354c9cc6 am: b5e836690e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3313974

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