Merge Android 12

Bug: 202323961
Merged-In: I76b505672b7c78b03a9c79df6473212ea5c65072
Change-Id: I262cbcc8dcfb0cad2b8e2f393c95829afe6b3827