[automerger skipped] Merge "Add KeyChainService credential management app...

[automerger skipped] Merge "Add KeyChainService credential management app APIs" am: e02debeb am: e5ba22ab am: 275601c1 -s ours am: 5b94267c -s ours am: 1e3a79d4 -s ours

am skip reason: Merged-In I00b7df27a92f6ee4f74546f892c83290fead1112 with SHA-1 e17727eb is already in history

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

Change-Id: I84f1cad5925ea443d77a1f44607c63d9fb0f18f9