Merge Android 12

Bug: 202323961
Merged-In: Iba7093418f180b59cfe5dc9f56a2b0319c9ee281
Change-Id: I84cc76c779f7c3746f8877d52f24da9f2e3594ce