Merge Android 12

Bug: 202323961
Merged-In: Ifba538258a3769e3177964e3f70f645ad93f3fd0
Change-Id: Ibc117fa547eeaea8dd5396351a64d87ed27396d8