[automerger skipped] Merge "Log the canonical path of the broadcast in statsd"...

[automerger skipped] Merge "Log the canonical path of the broadcast in statsd" into tm-qpr-dev am: 881d0fb8 am: 7cca4f9a -s ours

am skip reason: Merged-In I13e8211dd3127fc2a7740463a73a1d33b5efb53a with SHA-1 eb839e7d is already in history

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



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