Merge Android 12

Bug: 202323961
Merged-In: Ibf6054a5dde793e6072917f498c83ed01e074234
Change-Id: I7c638689331513a2ecdc8c0685ebff5953a78ffd