Android mainline 12.0.0 release 5
[automerger skipped] Mark ab/7061308 as merged in stage. am: 8b28ac89b2 -s ours am: 13cbf156c1 -s ours am: 517ee63ccd -s ours

am skip reason: Change-Id I35e35d979fb8aea7926cfa2ea8f5fa084287b7bd with SHA-1 ad8f39c73d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d78e1732b1f4858ce8a4645e9ac2d82f082ad30