Merge "Remove the NetworkScore class." am: d1edb37ac7

Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7