Merge "Add extra debug logging" into udc-dev am: 3ed995b3 am: 4ac428af

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



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