[automerger skipped] Fix a syntax error in SystemServiceRegistry
am: 1ecf4ac212  -s ours

Change-Id: Ifc57ede1d2b4078bd5813ed41501405df58b3f38