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

Change-Id: I6122ff9e2393c854267068ec74cb33a377132ea1