Merge Android 12

Bug: 202323961
Merged-In: I607aeb0147fd05a0d23f22214f1fa3b1eeacf0d5
Change-Id: I4e4311068ddda3dbf284864000ef770b61d1d6ae