Merge Android 12

Bug: 202323961
Merged-In: I44395460a9d0d4c42e675be2439b39bc80c82caf
Change-Id: I7796e57242cbc98dd941741a86a959b9c2d20c6c