am 6c841761: am edd70562: Merge "Revise Call Settings in Telephony." into lmp-dev

* commit '6c84176113b54acf3c30aa46e37397f8adb7593a':
  Revise Call Settings in Telephony.