Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib170bb6f36a086ac7fcab2c0bfc29153f9335a47