Merge "CertificateTest: explicitly set validity check date am: 9a659a11 am: 730485e1" into nougat-cts-dev