Merge "Keystore 2.0: Update credential settings to use public Keystore API."