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