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