Merge "Pass caller information in cancelBugreport." am: 21d36ec4f5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec3425e57af20906ba0459ba96b06fccedfb8954