Android 12.1.0 release 4
Merge cherrypicks of [16745824] into sc-v2-release.

Change-Id: Id6133d5ad3443aa91bb82f285194986abbe16b7f