[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664

Change-Id: Ifd8d821683c3c61e2a0e10ac4ce0c24e74e06282