Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155" into marshmallow-cts-dev am: 6bb2a718 am: e804e389 Change-Id: I6e088973a07c15150b5b992a8cfa72f651a77102