Android 12.1.0 release 1
Merge cherrypicks of [16778403] into sc-v2-release.

Change-Id: Ie5649ce77ccb6510d5677112b84c09e1e6429324