[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb am: 424cd636e2 am: 3b43270cb8 -s ours
am skip reason: Change-Id I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2 with SHA-1 eff614db00 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f75cd0d0ef389304cde68a80152135cb979f476
This commit is contained in: