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

Change-Id: Id65659d53002b7afcf8d3a728cc679cc0c3179e4