Merge "Do not kill ANR-ed debugged application" into main am: 123ba0f593 am: 60d4721601

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873097

Change-Id: I14706b394fd7ba44d402f2250c66de2f0b26550e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>