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

Change-Id: I2cf125ea80b0c27abe9e5f415aa1c71d688967f1