Android 12.1.0 release 24
[automerger skipped] Mark ab/7061308 as merged in stage. am: 05b0e08e82 -s ours am: c8715d9186 -s ours

am skip reason: Change-Id I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 with SHA-1 cbf2cb0386 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifef033f111035b859eeffe54468c963d05299dd8