Merge "Fixes flaky ZippedBugReportStreamTest" am: 6fde2dde06

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

Change-Id: I795a1922d16d6128438e26127bf3f281c75ee6c4