[automerger skipped] Merge "Clean up code in BugreportProgressService" into...
[automerger skipped] Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa am: bf7239c1 -s ours am: c1544e23 -s ours
am skip reason: Change-Id I8f0fb4865c1b7c5d62bebca3e250eee59b4e71f4 with SHA-1 e1be940b is in history
Change-Id: I7269c5ab21f3dd9126581f934d9fc718f8aaaa11