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

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

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



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