Merge "Add more arguments to Dumpstate binder interface" am: 68f8a18e71
am: 2172a6cb47

Change-Id: Iac193025f03a879c5512c541cc58fe4df0864030