am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings""

* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
  Revert "Revert "Update Trusted Credentials screen in settings""