Android VTS 12.1 Release 4 (9195718)
Snap for 8068644 from 52969f9fcec40ddb839569d97199bb6c90498a87 to sc-v2-release

Change-Id: I137ebecff2a4c1cb9fc49cf49010d50587677417