Android mainline 12.0.0 release 96
[automerger skipped] Mark ab/7061308 as merged in stage. am: 5428f56473 -s ours am: d61ec4c721 -s ours am: f2acc027b9 -s ours

am skip reason: Change-Id I6017d049dfe7d4d33e4deaa6f821dcf9c8573f35 with SHA-1 0b68dd31e4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9c0e72c516067601934f1f7377a02086655e78d