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

Change-Id: I45633c46691e0f5fd0bb05022901e7097fe7497e