Merge Android 12

Bug: 202323961
Merged-In: Iaa926aa00e7d1a5a1604cf8c01c4bc66be05e678
Change-Id: I86e11e2ec09103bb7ba9d7cd5d4321fac97d2518