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

[automerger skipped] Merge "Merge "Log the canonical path of the broadcast in statsd" into tm-qpr-dev am: 881d0fb8" into tm-qpr-dev-plus-aosp am: f16f11dd -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: Ideec8d7d5e501265d81dc8e25a26b91449c00c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>