Merge "[automerger skipped] Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into marshmallow-cts-dev am: 9acef519d9  -s ours" into nougat-cts-dev
am: 4e2287eca5  -s ours

Change-Id: I69eebecb43b602c8476e09578109708c858f4124