Android VTS 12.0 Release 2 (7973604)
Snap for 7625910 from df53726c484a61204ae705f447b5f024566b7421 to sc-release

Change-Id: If28efe337871c54a0b4f67c818720c9a9d7a0a49