Merge "Revert "Add Winscope report to the bugreport when using continuous mode"" am: d39a2efd0c
am: 39e77888c7

Change-Id: I15082c1c01f3642763df36397bddfe5def24d463