[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am:...

[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8 am: 424cd636 am: 3b43270c -s ours am: d4d71088 -s ours

am skip reason: Change-Id I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2 with SHA-1 eff614db is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3113f2cbb54a4c9508a8c49493d6d2602d0439f3