Merge "Add KeyChainService credential management app APIs" am: e02debebcf am: e5ba22ab36

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40a70a22f5d652e24d3fb31569e639e9313927b1