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

Change-Id: I773c2b525f0cc660d418e3165a4af3d688c6b27b