Merge "CTS test for Android Security b/152539155" into oc-dev