Android VTS 12.1 Release 2 (8513557)
Snap for 7929330 from 313f35262abc31fd04ed7e1c131e707fa5f47049 to sc-v2-release

Change-Id: I2d5a91316b7fddcfd42baadb41d9862719ac32d0