[RESTRICT AUTOMERGE]: Revert "Revert "[RESTRICT AUTOMERGE]: STS test fix for...

[RESTRICT AUTOMERGE]: Revert "Revert "[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
Bug: 135720435

This reverts commit d0d04284.

Reason for revert: reinstate change for nyc* only

Change-Id: I86b7b430dc5535969360d7006b296f6af06dacb8