Merge "Add a function to Dumpstate service to trigger a bugreport" am: 2040362034 am: f7044acb2d
am: 3608311c51

Change-Id: I55bf125be1b9d7288f3e96f58d969d76ac31404e