Merge changes from topic "am-a34004af1e6a4e19af65e459f990a895" into android13-tests-dev am: aa06950cc4 am: 5059306839 am: b2608488f6 am: d9f16b9966 am: 7d15d3bba1

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

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