Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev
am: 0bbde28dd4

Change-Id: I2a7f903bf824ca057a52a0a5c02873c5d154ec0c