Android 12.1.0 release 14
Merge cherrypicks of [16622627, 16790556] into sc-d2-release.

Change-Id: Iea899cc8a3b77c6827d7091d81271412a867fe54