Merge "Add extra info to log to hopefully narrow it down" into udc-dev am:...

Merge "Add extra info to log to hopefully narrow it down" into udc-dev am: 6c0f7a83 am: 2f58f581

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



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