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

Change-Id: Ic935e9395b82ceab9509b17682910f02b0dc439d