Merge Android 12

Bug: 202323961
Merged-In: Iccbc0d804f2115e83f8eb2889a57b66b77e0cd27
Change-Id: I4ca05e1857896c1f1e5f3e7bfef7b1efea3f487e