Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into android13-tests-dev am: bac4d2b7a7 am: 12aef7ca50 am: fe519233ea am: 2b5a85e794

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2611381

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