Merge "Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours" into nougat-mr1-cts-dev