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

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

Change-Id: Ifae0f8b1b5d89632dbf47de5ba8aa793d3049063