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

Change-Id: I31dc9fa863c7fea26b35838f35a40954a644a70e