Android VTS 12.1 Release 2 (8513557)
Snap for 7362794 from 214241aa94ef41fb199eab37edd2aaef69e01877 to sc-v2-release

Change-Id: Ieefc0e9a6b66024043414122c0a365d849fe6f57