[automerger skipped] Merge "Merge Android 12L" am: 15ce0a2279 -s ours am: 071e24e420 -s ours

am skip reason: Merged-In I33dbff12e154a0eefcc278fa3feb2f28936fe37b with SHA-1 08c53ffffb is already in history

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

Change-Id: Ic110a6f11ca475dd12d1000713d3b7c57782a036