Merge "Add "--" to separate program args from lldb/gdb server args" am: e7a66b15d7

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

Change-Id: I1186f5b04d8eb67e392750d1e6f51638fc8d1bdf