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

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



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