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

Change-Id: Iddb4c85b71d8fd17fda049e6137eec7a91f18413