Merge Android 12

Bug: 202323961
Merged-In: I46d721193aaba14fb8028dbe4ebe25b5ddb999ee
Change-Id: I3860a99f79eaf7ea33741b16df28cb00afa47116