Merge "Fix framework crash" into sc-qpr1-dev am: ad28fe0efb am: 796530eae6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748726

Change-Id: I0379b39a22e9226efc14fc43230d72aa38ed2054

services/core/java/com/android/server/location/provider/LocationProviderManager.java

@@ -1078,7 +1078,7 @@ public class LocationProviderManager extends
         }
 
         private void onTransportFailure(Exception e) {
-            if (e instanceof RemoteException) {
+            if (e instanceof PendingIntent.CanceledException) {
                 Log.w(TAG, mName + " provider registration " + getIdentity() + " removed", e);
                 synchronized (mLock) {
                     remove();