Merge "Allow for PSTN accounts to be marked as not emergency call capable." into cw-e-dev
am: 411bdc1272

* commit '411bdc12726036c7785d347bb33cddb410a02cd9':
  Allow for PSTN accounts to be marked as not emergency call capable.