Android 12.0.0 release 27
[automerger skipped] Mark ab/7061308 as merged in stage. am: 231a577ca3 -s ours am: c0346f4990 -s ours

am skip reason: Change-Id I1b7fe671562def65f089094e56fda09deb14bd7b with SHA-1 716864e6d7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I007256f2983ca51aea95a0c08f0a9f4414f8b527