[automerger skipped] Merge "Merge "Call InvalidationCallback#onCompleted when client is cancelled" into android15-tests-dev am: 5ef29ae2" into main am: 2b9fc5c1 am: ad34e5da -s ours

am skip reason: Merged-In Id5ed4bc5f8e38052b8011528015945ed51639fe9 with SHA-1 da582a35 is already in history

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



Change-Id: I7aed5a4f4e11cc5473f913f03f5b72eee2d1ec1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>