keystore-engine: Couple of bug fixes for HIDL keystore
am: 30b220e734

Change-Id: Iedf48715d193772241838fb0287a5e0a4a7b20f2