Merge "WifiNative: Catch IllegalStateException for nw mgmt service interactions"