Merge "Include command-line arguments in comment." am: f7bf9abb58 am: 8b34a8a348 am: 727f16f7bf

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

Change-Id: I5387974e27027d05e67f07120391e9f3e1ac64c7