Android mainline 12.0.0 release 4
[automerger skipped] Mark ab/7061308 as merged in stage. am: 9e24a0d95e -s ours am: 221caa5c42 -s ours

am skip reason: Change-Id I0144dd7720612aec54afc9d603edeb3aadad3e30 with SHA-1 4028e7a5b5 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I788b63b0ddadc5801866263d7de56a9f7d856a9c