Merge "Add vts to test for Android Security b/32591350 am: f662039257" am: 6e32a23948
am: c424497889

Change-Id: Ibeae6232f9ffe7853f825dc636c5b5fa3cbad06c