Moving classes that must be used by an ImsService to base/ am: ffc6936284 am: 0f92c09a64
Brad Ebinger [Thu, 23 Feb 2017 20:19:51 +0000 (20:19 +0000)]
am: 126dabe574

Change-Id: I6afbf0f07a1d4e6be0ef3848d2ec7bf8413faf9a


Trivial merge