Merge "lldb-vscode" am: 3ed4345762 am: 92a942bb21

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffa42a25bbe8416551060c201259e448bf109799