Android platform 12.1.0 release 1
Merge cherrypicks of [16684151] into sc-v2-platform-release.

Change-Id: I6c41d3174c6ca21a1edd8aef1d3ef319b2335647