Merge Android 12

Bug: 202323961
Merged-In: I304701a1ad5be47bec534d679eca259b06cb084d
Change-Id: I4b42e56dec2126cdc74b15ebbf28d15b2b814c29