Revert "Revert "Add Credential Manager settings""

This reverts commit 7a231eaba04c43697d9843c4dd94f320a6c0b3d8.

Reason for revert: Adding in fix for issue that caused initial revert

Change-Id: I395c13fb46fc570a6b8a663d4b4e5537866325ce
10 files changed