Merge "Add extra debug logging" into udc-dev am: 3ed995b3 am: 0073e454

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



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