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: Ib291e500f35989f14844ca586cc79e273e805ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>