[automerger skipped] Merge changes I0eb2841e,I0eb6acbd into android13-tests-dev am: 1c0dfa0a08 -s ours

am skip reason: skipped by user yabinc

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

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