Faster bugreports (5/n) am: 6b1ea2da68 am: 55f771a602

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

Change-Id: I42e9e977807d0043b37811882d08349748713e56