Android mainline 12.0.0 release 19
[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s ours am: 5c4102760b -s ours am: fb0cfde26c -s ours

am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8160bf3b32767806b0a6dad911b16121d6317e4