Merge \\"Do not wait for EMERGENCY_CALLS_ONLY state to place Call\\" into nyc-mr1-dev am: 8c2e80c179
am: 0c14ccc3af

Change-Id: Ia229a3dce9b234b230421ab0c02218c00bd66610