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

Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d