Merge "Update NetworkScoreService to use SystemService" into pi-dev am: 3a0681d137
am: 4a02a1fd72

Change-Id: I7c030a2f1cd9ad4400758e04e4548335acde3dcf