Merge changes I6948de2f,I5ea96193 into pi-dev

* changes:
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/17769851
  [RESTRICT AUTOMERGE] CTS test for Android Security b/17769851