[automerger skipped] Merge "Merge Android 12L" am: c62c7edf66 -s ours am: b3bb5e7732 -s ours

am skip reason: Merged-In I2bf469307acd968bf4faa789a9325173d6351c1d with SHA-1 19929dffff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2012639

Change-Id: I1af88120867af436e20d915a862fb4475f8d5c9c
tree: 78a50537acb3bdee5be3897cb2a9508a551ac3e9
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/