Merge Android 12

Bug: 202323961
Merged-In: I45a3fa76d6f66181705a1faf599e7f9839750a38
Change-Id: I040042428a96a6551bad2136e3b29b59c3014907