[automerger skipped] Fix a syntax error in SystemServiceRegistry
am: 10e276a24d  -s ours

Change-Id: I79cb70aef217c3ec4bd42f0023e009506836a191