Merge "Fix NetworkScoreServiceTest.testSystemRunning."
am: 5b4aec1dc6

Change-Id: Ic80d796221d94a092ed210dde3d1e3886d950265