Merge "DO NOT MERGE Updated the SecurityPatchTest to look for a minimum date of 2016-04" into marshmallow-cts-dev