Android 12.1.0 release 10
[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -s ours am: e02f47dc6b -s ours

am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55d8fe8a5878ed867e93b6a6423f231e4389c29c