Merge "Allow passing arguments with -- in addition to -." am: 6999b11924 am: 316661da78

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

Change-Id: I5bed3af520a0225e7d21c6fffe51322ed9dc30b5