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

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



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