Merge Android 12

Bug: 202323961
Merged-In: If0b691fb263ee2717844e8bda388310d2360ffd6
Change-Id: I9de23217a0b002a577a47086e1d6a9794a8b657f