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

Change-Id: I2eb6c1cdf326085ea335d1bc1dfa721ccacf0fef