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

Change-Id: Ibfff2c0434c8ba0fd7a9da0b227c8b6c40586300