Merge Android 12

Bug: 202323961
Merged-In: I9114ea285729d962366230d32f254619edd5ffa5
Change-Id: I9237719ec7f8222b0916bc3b75fca4358ad757ba