Android platform 12.1.0 release 7
Merge cherrypicks of [18993507] into sc-v2-platform-release.

Change-Id: I8934f997099f846a71681fbafafd8a419bc984ff