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

Bug: 202323961
Merged-In: I73d64334d80989a28d24d4528122c754d6b653e9
Change-Id: I9607dafca2998fbb4edd74afa1d418c05e8041b3