am 4431d5dd: Merge "Update Trusted Credentials screen in settings" into lmp-dev

* commit '4431d5ddf43445ee023f6e43608517911f6e0cb5':
  Update Trusted Credentials screen in settings