Merge Android 12

Bug: 202323961
Merged-In: I5f79c277a76c4994914c6e7611338dded991644f
Change-Id: I9830cab702eef1c1dc8b09e1fd6f72861019b426