Merge "Fix CTS failure at AvailableNetworkInfoTest"