Android 12.1.0 Release 6 (SP2A.220505.006)
Merge cherrypicks of [16622627, 16790556] into sc-v2-release.

Change-Id: Ic67b9b86a3ecdc9ef3ee1929730ab62ac2ea187e