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