Merge "Refactor CredentialHelper Constructor" am: f2791468e7

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/1343522

Change-Id: I3c1fa2ec74732cf7d8e0a0f17fe08f4a66bf1ba9