Merge "Add --vscode-launch-props to gdbclient.py" am: 2876fbc6ed

Original change: https://android-review.googlesource.com/c/platform/development/+/2597823

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