Merge "Fix cancellation on the provider side" into udc-dev am: 8190aaa4

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



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