Merge Android 12

Bug: 202323961
Merged-In: Ib0c64861fd67118e2c12c9cb44af415f455afaf6
Change-Id: Idb73a9d0a1e651ad525e47dd9625e04196ca1725