Merge "Fix ImsMmTelManager API in accordance with the council" am: ea5bb6cd3b
am: 5e7bfe1147

Change-Id: Ib71efd9afc25f0dbdd9547137c1d66d26e86b181