[automerger skipped] Merge "Fix ImsMmTelManager API in accordance with the council" am: a32e889ea5 am: 3d8361bb05
am: 8a72377888 -s ours
am skip reason: change_id I000a1300087a59415a8a4cabc90c117beb7459b9 with SHA1 1c162041d3 is in history

Change-Id: I9a336be1ea67611e107697187d0de6e685ee3733