[RESTRICT AUTOMERGE] Updated CTS test for b/36389123 Bug: 36389123 Bug: 72379466 Test: Ran the new testcase on android-8.0.0_r21 with/without patch Change-Id: I822e05724969cba829322d35ed85ecfa079682b0