[automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 am: 5bddee5d am: 7e3ab781 -s ours

am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4296856168c4a7261fd12a172e0336010688499e