Android platform 12.1.0 release 11
Merge cherrypicks of [20068332] into sc-v2-platform-release.

Change-Id: Ibc7ba808ca9e5d151d62d69a9928c89a8963e473