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

Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I377115aca6b2df8052ae118f986c2f713535b6ec
3 files changed