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

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)
diff --cc services/core/java/com/android/server/location/GnssLocationProvider.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)