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
Change-Id: I8323c31c40a503863adde8b341aae8fd4b49889d