[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: 6ff70ddc -s ours

am skip reason: Merged-In I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2 with SHA-1 eff614db is already in history

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

Change-Id: I38f1a5f81a339cc57f75c3422b7324bc63191ce6