Android platform 12.1.0 release 9
Merge cherrypicks of [19008482] into sc-v2-platform-release.

Change-Id: I24b088a0d7cfa1abd9679b2656203252dfd8ac2a