Android mainline 12.0.0 release 4
[automerger skipped] Mark ab/7061308 as merged in stage. am: 442ee40ed7 -s ours am: c3e5a2c4b1 -s ours

am skip reason: Change-Id Ibde80548980d6eaed9ca95accaabf7fcf1c4860d with SHA-1 2a5a93fdfd is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2842262e956ee039a462cac8280848d70715562