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

Change-Id: I028b8a9db476858805e267ad942841ea7af1c7e0