Merge changes from topic "debuggerdhwasan" am: 98619ee611

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

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