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

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

Change-Id: I51a18bbf0fc203cb7920034115ef35061da0cb60