Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8cc4630521
am: 19a1107089

* commit '19a110708959b7b35e0d182e543f81e495de140b':
  Trust the certificate after unlocking screenlock

Change-Id: I8b7090350236af52cdb345466a141c81e5af1d0b