Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b

Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8