Merge "Ensure only one bugreport is in progress in dumpstate" am: 57928b4fa0
am: d20d8268dc

Change-Id: I2c1cecf20621e8e44fbd96913ad8ffcbc6c3dacb