Android VTS 12.1 Release 2 (8513557)
Merge cherrypicks of [16841972] into sc-v2-release.

Change-Id: I3bde0780cae28af89467ff89a2be4d6bdec92283