Merge Android 12

Bug: 202323961
Merged-In: Ib990ec9b715a61091e08e82917262a952632c11a
Change-Id: Ibbf13c38205f3f3ac8f0e08609d4b4aaff28d6c4