Android VTS 12.1 Release 3 (8876974)
Snap for 7989966 from fa8bd0fb060527f6a8b1bf855356df207e250160 to sc-v2-release

Change-Id: Ic1d5924a65c8bae1f51ff2524fc15a85c5974fd0