Merge "[automerger skipped] Merge changes I0eb2841e,I0eb6acbd into android13-tests-dev am: 1c0dfa0a08 -s ours" am: 1adcce5e7e am: 2122700689 am: 79616b34ca am: c6d9faabf2 am: 566922ad06

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

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