Merge "Include more broadcasts related data in the activity service dump."...

Merge "Include more broadcasts related data in the activity service dump." into udc-dev am: 46354b9f

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



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