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: 280d3916

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



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