Merge Android 12

Bug: 202323961
Merged-In: I7b09b730f08983d74daa74d7410a533428738c81
Change-Id: I5affd455fa2d794294c1a952e24ea93e3951c29a