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

Change-Id: Ic2dc5fb0965b384daed83b6dbc3fbe3f28470fc0