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

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

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