[automerger skipped] Fixes BugreportReceiverTest failed am: e9a2038f am: dfa52cd6 am: f64837f1 -s ours

am skip reason: Change-Id I99a052d74b71d503a655a769064a74246da150e5 with SHA-1 bc1f3bff is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaacd50dcca4dd7aa7764b70925a18cd01bbbc62f