Merge "Mark cancel when client is interruptable" into udc-dev am: adce2aea

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



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