Merge "Handle null carrier config for emergency call hint"
am: 1f6216ca54

Change-Id: Idd899214d8f5e244d2f59494e597b6ba943fce5c