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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53469e3b7f38270b95bdb2f926470216676f87b7