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

Change-Id: Ie5062e388cc83c55176757cd1d1383d7793f43d2