Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API, use appropriate method...

author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)
diff --cc services/core/java/com/android/server/location/GnssLocationProvider.java
Simple merge
author	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Wed, 11 Dec 2019 03:37:15 +0000 (03:37 +0000)