Merge "Don't send cancel after client finished" into udc-qpr-dev am: 506113b8

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



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