Merge Android 12

Bug: 202323961
Merged-In: Icc0b695c320d81ca5c0bfbaf7c1fac9a45f9699c
Change-Id: I0320e69ab2be599608cf036538ef03196ddf0bc9