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

Change-Id: Ib935408d71e9c7ae7883d243f5adb2421991aab6