Android mainline 12.0.0 release 19
[automerger skipped] Mark ab/7061308 as merged in stage. am: a1f2ee7200 -s ours am: f9476cffdd -s ours am: a31f42d7f1 -s ours

am skip reason: Change-Id Iaa234f89b2bb04ef44e5dfc9b0699a1106e95514 with SHA-1 ae21beb324 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I085c163020d329283f9a30c91faccce00ebcec94