Android VTS 12.1 Release 4 (9195718)
Snap for 7995257 from 48c76d24fa5a6a39abe84a423b755f91ba2d0536 to sc-v2-release

Change-Id: I9a2cdac6b6e76847737201840b8fb47603c8ea44