Merge "Fix potential miscellaneous debuggerd issues." into main am: 9f32fba6...

Merge "Fix potential miscellaneous debuggerd issues." into main am: 9f32fba6 am: ffd2acb3 am: 8d590cfa am: f16257c2 am: 00d919d3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681535



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