am ba2f181a: am 74af6700: Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev

* commit 'ba2f181aa1607e9bd2bf1b723dac8a6c855fab14':
  Add video calling setting to TelephonyManager.