Android 12.1.0 release 15
Merge cherrypicks of [16983909] into sc-d2-release.

Change-Id: I58a68fb73c66cdca5c41ac03d3e7d260a5565557