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

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

Change-Id: I8a9dfa92e5b3a6b65e81b67bf2fa6c66a06ffdfa