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

Change-Id: Ib4448530acb3e3d0088cd898dc93f0e4ddb6b87c