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

Change-Id: I7be705f8074a88235485b1062a7aedc2a453506e