Merge "Wifi: Handle NullPointerException during AddNetwork for EAP types"