Merge "Remove telephony hidden api usages from commands"
am: e07c943cfd

Change-Id: I439df24d973dce041a4ed8d1659737973548c130