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