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: I33bbf4be4f2a0c659edc793c81e9dfec6e1e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>