Merge "Add configurable emergency call number support" into nyc-mr1-dev am: 265fcad145 am: 62535bb6ae
am: 310a02239f

Change-Id: I64c9296953a1384d328c436f776c453d69312b46