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

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

Change-Id: I920169309c711fd606eff7501dca111fa64fb620