Merge "Revert "Add public fields to NetworkScore and make it @SystemApi"" into rvc-dev am: 543ff5f0 am: c3f36e8a Change-Id: I8a74f599dd31b96079e36b1a5001763cbe0dc9ec