[automerger skipped] Merge "Centralise logic for setting credential manager app" am: 353a2c4fde am: 6cf93cd8aa am: a90997e606 -s ours
am skip reason: Change-Id I4290bccf5ae04de0d84c7091729e86704b937295 with SHA-1 392e1e23e5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549397
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e0be56eda9bad8d2e5948d533de48147ef5bd7e
This commit is contained in: