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

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

Change-Id: I04866343783b0cd31c89274119394e623ef73622