Merge "Adding SUPL NI Emergency Extension Time" into pi-dev
am: 73c242793f

Change-Id: I2b2c76c98ba4460fff8ccba57e7b86acc3ec6575