Merge "Add more info to dumpsys output"
am: 6109ea3b16

Change-Id: Ib899fc9e8a68411be35e64eab4b78b745ac8fdbf