Merge "Account for User\'s Voice SIM preference for E911" into nyc-mr1-dev am: e5dbef8e52
am: 14287da1cd

* commit '14287da1cdcbcea4ca8ba2518791047b04cce167':
  Account for User's Voice SIM preference for E911

Change-Id: I0c0160ef3a873d2cd45ca9a52aed242ddc89aae9