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: 7e5a9600
Change-Id: I2ccca351898ade0bc36d2e441d504ecdf6a9e00a