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

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

Change-Id: I424202b7e79a05d89e4897e72214342090f6eb3e