Merge changes from topic "revert-2017-0729" into cw-f-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/37710346" am: e9dcebaa79 am: 9300a9659e am: 0a84f70621
  [automerger] [RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/37710346" am: e9dcebaa79 am: 9300a9659e
  [automerger] [RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/37710346" am: e9dcebaa79
  [RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/37710346"