Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2014-9803" into oc-dev am: 6f0e79b86b
am: 47aafb9302

Change-Id: I495fa7c7db64a3aad7ce2e37c3ada69adb441695