Merge Android 12

Bug: 202323961
Merged-In: I1a00f8121b896ab893aeb805c1f21b0f55b7d416
Change-Id: If3c14bbf1753a5738a5bd4bc57881bfa58c38abd