Merge "bugreport/bugreportz: improve help/errors." am: c066439f am:...

Merge "bugreport/bugreportz: improve help/errors." am: c066439f am: 0ec91b32 am: 872f2236 am: 74b6c819

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

Change-Id: I3d7fd8fc4a45d0449d9efb2d53b003df15f9b4ec