Merge "keystore: Move wifi keystore HAL service out"
am: 2c62e2b83e

Change-Id: I3f63663ed5dc6b1d880f91e0dc8e2e8eb3b920df