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

Bug: 202323961
Merged-In: I5b235cdf4ae9572bb3768d75bd58e5a7dd9967e6
Change-Id: I821f9534722855f60c7696f64a621d8d6e0bc2c4