Merge "Adds Phone Capability check to E911 slot selection" into nyc-mr1-dev