Merge Android 12

Bug: 202323961
Merged-In: Ib7852498d75746d07ea035ba1dc9302eb0d9d7ac
Change-Id: I4dcabe3871f6cda278137e43c6177be9103607a9