Android 12.1.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: 4e2b8fdb44 -s ours am: 5859ce9381 -s ours

am skip reason: Change-Id I6137057e05c9c99cba2e4c699d5e702e24e0dbd6 with SHA-1 26ba5ac7b3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22f6dc6356736c02c67ab54bb36153eed41a1cf1