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

Change-Id: If9f39a527dfe30005351918a45a3e0fdd03f37ad