Faster bugreports (6/n) am: a5de575226 am: 0c88b54c2d am: d1324bab39

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

Change-Id: Ib498d9963d1a84349b7dccd76a4de71bf5105354