Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev

author Wyatt Riley <wyattriley@google.com>

Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)

committer android-build-merger <android-build-merger@google.com>

Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)
author Wyatt Riley <wyattriley@google.com>
Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)
committer android-build-merger <android-build-merger@google.com>
Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)
diff --cc services/core/java/com/android/server/location/GnssLocationProvider.java
Simple merge
author	Wyatt Riley <wyattriley@google.com>
	Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)