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