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

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

Change-Id: I59d02affa699aa402c781fdbc2c58ffc3801c920