[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: 4e46d94f -s ours am: cf9d1616 -s ours

am skip reason: Merged-In I4a77cc4617025fc06009e71c7d96caea9e101878 with SHA-1 70e3c929 is already in history

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



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