Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/111603051" into pi-dev