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

Change-Id: Ifcd07433ae7d4741b2c655b9d700040a402b3fe9