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