[automerger skipped] [RESTRICT AUTOMERGE]: FIX CTS test for Android Security CVE-2018-6267 am: d8e6ec1a05 -s ours am: 174bda631e -s ours am: 74a7895a0d

Change-Id: Ib2e4a3b8d0db124f8a1553f92f04fccba7557d12