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

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

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



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