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

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

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