Merge changes Ifc8307d2,Ide5aae9b into oreo-mr1-cts-dev

* changes:
  [RESTRICT AUTOMERGE] Fix expired test certificate
  [RESTRICT AUTOMERGE] Fix leaf certificate for download manager test