Android 12.1.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: 5c8a27f88a -s ours am: 17d182aab0 -s ours

am skip reason: Change-Id I8c313b95aed25064bcb98ac32a90c51b6bc3008d with SHA-1 d36ba380da is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5233df4b93aa8c5029f900095f263b1992e4c4c0