Faster bugreports (4/n) am: 2cc4eec9b9 am: 53a0049dfb

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

Change-Id: Ia4aa560163f66530ab71a9e2858b5b60d4b6e8c8