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

Change-Id: I499720ddef4f6dc9652af87e36772fc04ef8ca40