Merge "New APIs for a keystore client to list and get keys" am: e7dc464319 am: 3f903ce422
am: 96308c7c84

Change-Id: I61372714edb591c28f8aa6022b3b3e59197ffc63