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 am: a2a844f8
Change-Id: I494c5ab9373fd56a7ce661f764d9dd1305394aed