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

Change-Id: I9b341880e8610795e1fffc477f89a2467a9ba01d