Merge "CertificateTest: explicitly set validity check date am: 9a659a11" into marshmallow-cts-dev am: 1c165243 am: b8b63a42 Change-Id: I73003eb5ff2edacde0c1168c340159d71347543c