Merge "Clean up MobileNetworkInfoEntity unused fields" into main