[automerger skipped] Merge "Pass caller information in cancelBugreport." am:...

[automerger skipped] Merge "Pass caller information in cancelBugreport." am: 21d36ec4 am: 61b2a3c2 am: 444e9178 -s ours

am skip reason: Change-Id I430d856014a226ef345bd2349f0601062dcaa8c7 with SHA-1 4a1b9e94 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43334a1f2633bcc49afddd3d5ab0fd01bd4cfb0e