Android 12.0.0 release 16
[automerger skipped] Mark ab/7061308 as merged in stage. am: 7205c07078 -s ours am: d837953767 -s ours

am skip reason: Change-Id I3d49e9da3021672f1896504ec29c10a5595d6ea4 with SHA-1 d25280c303 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87655baffc4900b4bcc612f9841eee8febee94f8