[RESTRICT AUTOMERGE] Updated CTS test for Android Security b/65540999
Bug: 65540999
Bug: 68653380
Test: Ran the new testcase on android-8.0.0_r2 (version without patch) and
on android-8.0.0_r30 (version with patch)
Change-Id: Ib26d8d3098d0fedb88a73c7e7d4321897b36fe34