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

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

Change-Id: I168b206dbf8a055511ad61935282119869dc7b8f