Merge "Add Winscope report to the bugreport when using continuous mode" am: 27c8800af0
am: e60c0ee81c

Change-Id: I7396665b4199d7765157f5d371dd276999c6a0b1