Merge "Remove testSecurityPatchDate as it is in GTS now." into oreo-cts-dev