Merge Android 12

Bug: 202323961
Merged-In: I972cce490ce5f64ed513b7c8b6b7ed1a884af731
Change-Id: I09c543b302aa2d1a9b255e035f949e74164d4fc4