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

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



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