Adds testing framework to com.android.ims am: 3eb99bdaaa am: d4af2331b8 am: f2818debe7
Brad Ebinger [Thu, 22 Dec 2016 00:51:26 +0000 (00:51 +0000)]
am: 227163ef2e

Change-Id: I7d3ed3bbf0dcf727143a9b532c75272823b5b03e


Trivial merge