[automerger skipped] Merge "When logging route id, also log package name" into...

[automerger skipped] Merge "When logging route id, also log package name" into udc-dev am: 3d3fc71b am: 06777733 -s ours

am skip reason: Merged-In I4a77cc4617025fc06009e71c7d96caea9e101878 with SHA-1 8bc0868a is already in history

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



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