Android 12.0.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: 19b9d82158 -s ours am: 31c16c1ce8 -s ours

am skip reason: Change-Id I5c56995272608cecb4a9a948e3c219d091ea7651 with SHA-1 66f15b81b3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfe1e3a78575fb143005c0f57389d48d37ac0955