Merge changes from topic "am-a34004af1e6a4e19af65e459f990a895" into android13-tests-dev am: aa06950cc4 am: 5059306839 am: 8d49929505

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

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