Merge "CTS test for Android security b/72509296 b/26593930" into oc-dev am: 1bdb93fe41
am: f473167970

Change-Id: I0b97ff35a4406e3bff34d2fb7beeca45b0cba1f6