Merge "bugreport/bugreportz: improve help/errors." am: c066439f1e am: 0ec91b3266 am: 872f2236e4 am: 74b6c8190f am: e2babb9fd7

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

Change-Id: I554d06626fe55046abdd3877db10fa79324fecb4