Android 12.1.0 release 13
Merge cherrypicks of [16730965] into sc-d2-release.

Change-Id: I0dcf5a1e5b8f7fea2491c5ad6f7cae4086fc6953