Merge changes from topic "am-a34004af1e6a4e19af65e459f990a895" into android13-tests-dev am: aa06950cc4 am: 5059306839 am: 8d49929505 am: 2c9c16848a am: 485da52418 am: 9c8248dd98

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

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