Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into rvc-dev am: 543ff5f068 am: c3f36e8ad8
Change-Id: Iac1be594415b771fce06024f8aeaad3199db0b93
This commit is contained in: