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

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