Android 12.0.0 release 16
[automerger skipped] Mark ab/7061308 as merged in stage. am: 678be469e3 -s ours am: 79afc4ee63 -s ours

am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie994c4ac15380a58c209333ac08245eea8886183