Android 12.1.0 release 16
Merge cherrypicks of [16718400] into sc-d2-release.

Change-Id: I199c886a26c85b51d769f9f3006bd60054df2e3b