Merge "Fix test failures due to unhandled exception in logging" into udc-dev am: ef61c5b6

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



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