[automerger skipped] Merge Android 12L am: dbe0f25851 -s ours am: c4c2173037 -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: I6f5c78bc7c74e21061d61ec96b24ab8ce890a46e