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

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

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