Merge Android 12

Bug: 202323961
Merged-In: I623d78b62308dec895c0fa15f38fedfc47d7013a
Change-Id: Iff32646cedebed894b886dc486b27b5df8e0a3ee