Merge "bugreport/bugreportz: improve help/errors." am: c066439f1e am: 0ec91b3266

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

Change-Id: I548d7810266109306bf7744aa237dd80d1dcb216