[automerger skipped] Fixes an error handling in BugreportProgressService am: 39b6acbb55 am: 76ac95e9be am: abe52a0718 -s ours

am skip reason: Change-Id I4542568fd2d2ad1c75c7c3b223accca4995938a3 with SHA-1 8ba3c84cff is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I118049d63e1a72b6d62c1d037cca60b57cb8cc97