Merge Android 12

Bug: 202323961
Merged-In: I3a661bed1ae2ee68896f860d7f694ac67bbb9475
Change-Id: Id2907044b79db51f8f76a33b3f2ffaa293cd37fa