Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 am: 5bddee5dda

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663