[automerger skipped] Merge "Centralise logic for setting credential manager...

[automerger skipped] Merge "Centralise logic for setting credential manager app" am: 353a2c4f am: 6cf93cd8 am: a90997e6 -s ours am: db2c2f8f -s ours am: 5e78f765 -s ours

am skip reason: Merged-In I4290bccf5ae04de0d84c7091729e86704b937295 with SHA-1 392e1e23 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549397

Change-Id: I93339ccd5cfbd87b4246287aa1661ba611ece3ca