Merge Android 12

Bug: 202323961
Merged-In: Ib3442e1d1e329876a7cfcdcae05f3ff6547a0c5a
Change-Id: I277817eba680bbce2c0a2658fb2b7307f8d70731