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

am skip reason: Merged-In I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61 is already in history

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

Change-Id: Id95d9e4ede165fa5cd517e17c90907168c460e8d