Merge changes I6948de2f,Ib40c5459 into qt-dev

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