Android 12.0.0 release 20
[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s ours am: 1de8f8ca37 -s ours

am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I707c8790845c4bc24b2e67dc4c5ce90735145880