Merge Android 12

Bug: 202323961
Merged-In: I08740b2e36340d196b0a64d1ab75ae2d3541b603
Change-Id: I90f3deb9857825eaa3bae14e935b96fbfb9a37dd