Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into rvc-dev