Merge "dumpstate: specify default args for lshal" into stage-aosp-master
am: d81eb0f2f2

Change-Id: I7df2e731acadbff677d14008fe6aaa7fb5e722ca