Merge "Don't send cancel after client finished" into udc-d1-dev am: 0e4974d5...

Merge "Don't send cancel after client finished" into udc-d1-dev am: 0e4974d5 am: baf6ee50 am: 6c08181d

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



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