Android 12.1.0 release 2
Merge cherrypicks of [16631483] into sc-v2-release.

Change-Id: I35243189d5e0d7f283b9bd629064d1b0091c1b55