Merge Android 12

Bug: 202323961
Merged-In: I4fb6bf1f3f0683aa16a62a6c9aeab074429a71bf
Change-Id: I7663cd03051787272381e2dcfd36f8b67d93d927