Android platform 12.1.0 release 15
Merge cherrypicks of [20084105] into sc-v2-platform-release.

Change-Id: Idb1a542ea42cd98993e57a30c82049cffc2e8247