Merge Android 12

Bug: 202323961
Merged-In: Ifb1931ed2b9c9188278c679ecce7b7930c4d5971
Change-Id: I9ca7ec558f0c0c90506588468a83e998c4e2bce4