Merge Android 12

Bug: 202323961
Merged-In: I9494082d36af92b66ff4fc7551d3659b9b51d8ea
Change-Id: I4400018adf807b723c48b5fe7c651ac6178ca2ac