Merge Android 12

Bug: 202323961
Merged-In: I36803f7c2ea81a81fa3ab3cf994d960f6b3f05ec
Change-Id: Ic3d79aefed0f956af87e56b188442feea676d5b4