Merge "When logging route id, also log package name" into udc-dev am: 3d3fc71b

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



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