Android mainline 12.0.0 release 5
[automerger skipped] Mark ab/7061308 as merged in stage. am: d19a2e9bb4 -s ours am: 535e7f3571 -s ours am: e8953d8d4b -s ours

am skip reason: Change-Id I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 with SHA-1 09dcddf076 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56ee9615573ecd589996739d470730851e3a2a92