Merge "wpa_supplicant: Use HIDL for keystore" into oc-dev
am: 020aae44a7

Change-Id: I9438ebd128ea76ff11e2e9e60829a7d8ff7219a3