Merge "Remove deadcode that supported non-zipped bugreports" am: 32ac30f71c

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

Change-Id: I8cc544950052a676983e154d7040e10c3d3977d6