Merge "Fix test failures due to unhandled exception in logging" into udc-dev...

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

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



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