Merge Android 12

Bug: 202323961
Merged-In: I408bfd18ce590466517900973893247b7c9c09fc
Change-Id: I7bf25cca10d2ce62047bf16810c17fab669a9652