Android 12.0.0 release 27
[automerger skipped] Mark ab/7061308 as merged in stage. am: 9d99abd6fc -s ours am: b9d61f08e9 -s ours

am skip reason: Change-Id I2f321cb7a3f813b791c6707eb6cc2f320694ae9d with SHA-1 b3c413d2e2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba80e9efc395ee1f2ea9f0a281bf4eef0c520a00