Merge "Don't let transition tracing exceptions bubble up" into udc-dev am:...

Merge "Don't let transition tracing exceptions bubble up" into udc-dev am: 4ea6f914 am: 11e600bd am: 6e3b5e58

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



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