Merge "Adds Phone Capability check to E911 slot selection" into nyc-mr1-dev am: d228e6a2af am: 50ddf74df1
am: 67ee96bc7c

Change-Id: If407c6778f6fc53c38f515c056f170e06947a77e