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: 4f220998 am: 2f9bc6e9 am: 944756a2

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



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