Merge "Remove the NetworkScore class." into rvc-dev am: 842b8d727d am: fad6f0878e

Change-Id: I0fed984a368f55438561df9a26b30f1b7055f123