[automerger skipped] Merge "Fix ImsMmTelManager API in accordance with the council" am: ea5bb6cd3b am: 5e7bfe1147
am: 92262ec974 -s ours
am skip reason: change_id I5d011e1875c082a4532747e30e8582ff3da4ee93 with SHA1 4b292c85b6 is in history

Change-Id: If926d944faecd5110264f92bf5aae896a78d5b53