Android 12.1.0 release 10
[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -s ours am: 26a6e6be8f -s ours

am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic89c76fb7b7b3b5f02cfac55c317de1a2135dcf6