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

Change-Id: I510bb52baf608381291d4ff4df7b1dd9c6d2d97e