Merge "Replace ImsManager static methods with proper ones." am: 112d2dae49
am: 15f2b9faaa

Change-Id: Ib3a8c8d88cd4850abda33df2eda61b253c2e8270