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: 535c8dad am: 2a1d4859 am: f9ef7ceb

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



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