Merge Android 12

Bug: 202323961
Merged-In: I0d9394aba092c75d423c96d258060353d0a3672c
Change-Id: I7e126629b17e52c2eb06225bf1e0f929807ad57f