Merge Android 12

Bug: 202323961
Merged-In: I4420cc393dd51b2e8e95e492fb384ce79fd973f7
Change-Id: Ia3c4e60a8f275156ba25a9f27cdf513ffda5de61