[automerger skipped] Merge "Fix ImsMmTelManager API in accordance with the...
[automerger skipped] Merge "Fix ImsMmTelManager API in accordance with the council" am: e01ce3f0 am: 0b1c6bac
am: 26b813f1 -s ours
am skip reason: change_id Ic5d0e0b4aad9c7eadaec4b80b0d907c40882f825 with SHA1 7e3d2cda is in history
Change-Id: Ibf0868f8ae8456d544007e041c2e4a694b068522