Merge Android 12

Bug: 202323961
Merged-In: I791d994193c34921f8301730c48b0e84c3d359c3
Change-Id: I22c59cdceff5922fcbdb7f8f57d010638b531487