Merge "Dumpstate aidl: add cancelBugreport"
am: 75c59f8bd0

Change-Id: Id4d14e506483879a9be5360ae552506111591aa4