[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 5421c8d17d -s ours am: 45b96bc4b3 -s ours am: fb257e6e18 -s ours

am skip reason: Merged-In I0da61e80bdf03a954accefbd88b9f2788ef08f38 with SHA-1 10e000b4a6 is already in history

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

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