Merge "Dumpstate: lshal runs in non-root in user build" am: 0c47ec9a82 am: 223a1cf193
am: cab71c3ffe

Change-Id: Id4c256b1b9f70ff3bf1a19d0dd5c851b02512724