Android 12.0.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: 98ac6fa9e4 -s ours am: 2600e11b6b -s ours

am skip reason: Change-Id I608635cd98125d36eca71737585ad2dfedd9a6d7 with SHA-1 cc43a9cde0 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If01f87c68f2ba0518fc256fffa785c9cd6f699ee