Merge changes Ifba05b57,Idd0f35fc

* changes:
  libkeystore-wifi-hidl: Updated to vendor_available:true
  libkeystore-wifi-hidl: Updated Android.bp