Merge "[RCS] Add IMS service into system service registry" am: 6a1d13f58e am: a962a65575

Change-Id: I61549d3d4da7ffdf5f2d497e52cd7a2fdd0f2c05