Android 12.1.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: 7965b95af4 -s ours am: cc9999ea18 -s ours

am skip reason: Change-Id I5fb0fd21e21036c4a9774c0ad17b7f5c663b576a with SHA-1 72446da6f3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb2f97b785ac76b3f604a3104f61f0e1aa019507