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

Change-Id: Iee45f0af05ecf1871d4dd93b2864a6246c679b92