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

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

Change-Id: Ibeac0873093879850351e86936bd2ebbff5261ce