Merge Android 12

Bug: 202323961
Merged-In: I565346d42353a9cc63ef73242068f001df661d1f
Change-Id: I9c5ede88d6ea65054a3b74e09289412b83b64d9c