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

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

Change-Id: I9e5127d32c100d68544e173210ba4144c7bac235