Merge Android 12

Bug: 202323961
Merged-In: I048709a2a2e1d782131e1260b8e675ce409dc150
Change-Id: Ifec1c0965c0620f6e25cab0be414040a9b5c3fff