Merge Android 12

Bug: 202323961
Merged-In: I3582a4714e6a3f1f29424b96f6b24b3b4e73783e
Change-Id: I07195926007b65ecc0633933d83cdf5e2fe1b291