Merge Android 12

Bug: 202323961
Merged-In: If9c1662ef79e1df216df3f49809eda6c383278ca
Change-Id: I933ac465a205cf951fd78b336ea67e9b1982a3f0