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