[automerger skipped] Merge "Remove telephony hidden api usages from commands" am: e07c943cfd am: 798e77ff77
am: a2a1150aa8 -s ours
am skip reason: change_id Ia1184f804b3b03104dd5c911b15c8c28190b2395 with SHA1 751de25d45 is in history

Change-Id: I4830f2cee0bd7d5b3df02f42248fcdd8e50ee503