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

Change-Id: Ic894002df6680918098097eee6207336718156ef