Merge "Fix the exception type set on ui cancellation" into udc-dev am: d449e20e am: 0e95a478

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



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