Android S v2 Preview 2 (S2B2.211203.006)
Merge Android 12

Bug: 202323961
Merged-In: Ic49cadf46a18852d4d4a4fe2fac6f0e419e89eab
Change-Id: I302a0396081e90eff8e70517c18a4a6f7b93db73