Merge "Bugreport progress notification should use the bug icon." am: cb783ea2ee
am: 704b11756a

Change-Id: I3d4aeb73aedb280e2c60f00d126d0179944e1a65