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: 2f225844

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



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