Merge Android 12

Bug: 202323961
Merged-In: I134038ad964f0144605d2f721addaaf903af6341
Change-Id: I35093f6ccf29021627d2f712f1731e88ad52a568