Merge "Clear registered prediction callbacks on destroy" into rvc-dev

core/java/android/app/prediction/AppPredictor.java

@@ -260,6 +260,7 @@ public final class AppPredictor {
                 Log.e(TAG, "Failed to notify app target event", e);
                 e.rethrowAsRuntimeException();
             }
+            mRegisteredCallbacks.clear();
         } else {
             throw new IllegalStateException("This client has already been destroyed.");
         }