[automerger skipped] Merge changes I0eb2841e,I0eb6acbd into android13-tests-dev am: 1c0dfa0a08 -s ours am: 8b4d3d376f -s ours am: 3ff27c17e2 -s ours am: 558bee4818 -s ours am: 16ba76af8b -s ours

am skip reason: skipped by user yabinc

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

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