Merge commit 'ed3713a8' into...

Merge commit 'ed3713a8' into am-254b7307-4e73-4da2-a305-c1cf8b4ff53d

* commit 'ed3713a8':
  [RESTRICT AUTOMERGE]: STS test fix for Android Security CVE-2017-0727

Test: cts-tradefed run cts -m CtsSecurityBulletinHostTestCases -t
android.security.cts.Poc17_08#testPocCVE_2017_0727
Bug: 72379249
Bug: 33004354

Change-Id: Idd449ef5598d48da2bf165b8bcd0bc071b436899