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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia68e95a1a200e1ac45cfe94cbbff07ea4759ad2a