Merge Android 12

Bug: 202323961
Merged-In: I7bc3cf534c65a5b976b410f0050e6a5caca312fc
Change-Id: I36b1cf4b504cccae602ed44a222ffa99b1156e8c