Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 am: a8fc97d2de
am: d136025272

Change-Id: I2190eb09039d7abc51d4752c410d1d38e220564b