Merge "Merge "CertificateTest: explicitly set validity check date am: 9a659a11" into marshmallow-cts-dev am: 1c165243" into nougat-cts-dev