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

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

Change-Id: I0520e4e7fbd2d00deccd6ed68e4f9c5c14191466