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: 65e5a45a am: 0e8e9e3d am: 5657d794
Change-Id: I0f0fae846b729d842566cc1f021727ee0494bbee