Merge "Fix NPE in UiAutomationManager" into main am: 6870708b4b

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

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