Android platform 12.1.0 release 7
Merge cherrypicks of [18002380, 18590705, 19139540, 19320801] into sc-v2-platform-release.

Change-Id: Ibccd8a995031f9199dac893b384ea440376d0557