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 am: 672305f7

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



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