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

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



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