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