Merge "Merge "Call InvalidationCallback#onCompleted when client is cancelled" into android15-tests-dev am: 5ef29ae266" into main am: 2b9fc5c105

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

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