Android VTS 12.1.0 release 1
Merge cherrypicks of [16848665] into sc-v2-release.

Change-Id: Iebe12db16a37872da9cd0515ef7c9801e9696425