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

Change-Id: I24f1e467ec5a9e4a1842e7cd53bd4e5127931c75