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

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

Change-Id: I7e83b9d6e4105653269576648c0c654a63f6f205