Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into...
Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into rvc-dev am: 543ff5f0 am: c3f36e8a am: 35c25d16
Change-Id: Ib29b93f9e4bfad40926554bd43a184e8940e1a88