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

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

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