Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001