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

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

Change-Id: I5f1a41429501cb3ce31bb79532672991c1e721fc