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

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



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