Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into marshmallow-cts-dev