Merge "Fix ImsMmTelManager API in accordance with the council"
am: a32e889ea5

Change-Id: Ib47cb61b1ed539ca97d6a8f832722f5a95040e81