Merge "Improve short service debug log" into udc-dev am: 73ec965c

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



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