Merge "Add public fields to NetworkScore and make it @SystemApi"