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

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



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