Merge Android 12

Bug: 202323961
Merged-In: Ibac10766358da418de5f64487275292845aa86cc
Change-Id: I5b91dd8e17bd18ed895ef4cf09062d213d7c47f2