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

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



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