Faster bugreports (2/n) am: 1c855127ea am: a9a4d8964a

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

Change-Id: Iea87ff1490127c86083075be6c60a55f35a79503