Merge Android 12

Bug: 202323961
Merged-In: Id6170b9a4167d5b51079c94bed8fd0a71d3be4ec
Change-Id: I46314da2f52ae483ab6f3ea6e0bb523b998201e8