[automerger skipped] Merge Android 12L am: dbe0f25851 -s ours

am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I0f3d40fc9b2d3b865635b0b27f37b9d6f04d1aae