Revert "Clean up system service registration."

This reverts commit a9f222406825b2b18f82f59967031a45df41f67f.

Reason for revert: broke build

Change-Id: I08d1e3b6f7f02627138ff3f50b436772e1eb756f
Fixes: 144460136
4 files changed