Merge changes from topic "debuggerdhwasan" am: 98619ee611 am: d559eb5e67 am: 953412c3f6 am: 0d0b044170

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2065733

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