Merge Android 12

Bug: 202323961
Merged-In: Ifaf3cdb2ee959482c8a9c8bd134e3fd444483aa6
Change-Id: Iba64d93248748f2894eca7f7fa881f4c3388b920