Merge "Revert "libkeystore-wifi-hidl: Updated to vendor_available:true""