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

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

Change-Id: Ib956cf6df36d090fcc4789fc386edc9416a44c58