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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4