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