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

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

Change-Id: I98fffe049c42c2c3ea8f96da0fb37e797d441319