Merge "CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast doesn't include WifiConfiguration"