Merge changes Iadc9610f,I279593ac into oc-dev

* changes:
  CTS test for Android Security CVE-2018-5892
  CTS test for Android Security CVE-2018-5884