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

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5