[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 skip reason: Change-Id I4290bccf5ae04de0d84c7091729e86704b937295 with SHA-1 392e1e23 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I600ecd1f01cdda2142ab3a538d22441e1ef49450