Merge "Fixes frequent ANR taking bugreport in background" am: 7c9b62c53b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b85c34e81dfb93ba07ff30e87518735f3747ce1