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

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

Change-Id: Idb511efb82d1718822ebac4106271b613248a45c