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

Change-Id: I8d43639b3f1fd63ef8b033d2eb9afcf37b62df2e