Merge Android 12

Bug: 202323961
Merged-In: I0311e0abb454fc9b7bdb1e9aaa5a380d6505830e
Change-Id: I0ed633f6f6c2669e644ab991febebc0a626ffb35