[automerger skipped] Merge "Add new ITelephony ShellCommand interface" am: 8098bdb83b
am: 55d77bf933  -s ours

Change-Id: I2c642218bcf08707254dd8be903f960661c465bc