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