Merge Android 12

Bug: 202323961
Merged-In: I30b71cd8e60526def44f87137037b965d969834c
Change-Id: Iceae6cb3d86697c947f7a413dd85b4cdbddc121b