Moving classes that must be used by an ImsService to base/
Brad Ebinger [Thu, 23 Feb 2017 20:10:37 +0000 (20:10 +0000)]
am: ffc6936284

Change-Id: I48ce41a34770aec3bcb3ba18f8bd236f46191dbe


Trivial merge