Merge "Clean up old Context references in ImsConfig" into pi-dev am: 65ac70515f
am: 617296457f

Change-Id: I15f1f1eeb17107e058eb75aec6d8f238113c5ab1