Merge "Fixes flaky ZippedBugReportStreamTest" am: 6fde2dde06 am: 61e0d7e2ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1670025

Change-Id: I5c7ad91953cdac0fb1b829b6c952a9d5ee34f745