Merge "Account for User's Voice SIM preference for E911" into nyc-mr1-dev