Android mainline 12.0.0 release 96
[automerger skipped] Mark ab/7061308 as merged in stage. am: 81d0e1d389 -s ours am: 21be0a4652 -s ours am: 4056291abc -s ours

am skip reason: Change-Id I50639ce2d780b0ebb5730fced59b75b5c3a9c13f with SHA-1 7d8132e72b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida67c9b52e98e45c7fefee66cdcfdfd2006ca648