[automerger skipped] Merge "Refactor to use new ImsManager API where possible"...
[automerger skipped] Merge "Refactor to use new ImsManager API where possible" am: bbe9c536 am: 0232770b -s ours
am: 78012745 -s ours
Change-Id: I11f1164fd02a7b4d7694ce3053815dd4cfda41b1