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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bf04bdfbb0b27ae6ed1d73395619550e71c7b2f