Merge "Restore @VisibleForTesting on NetworkScorerAppManager." into oc-dev
am: 4734737329

Change-Id: I1cf133271cc405178d2562f7a38299948c689e86