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

Change-Id: I45fc18eeef93ddadf52c9232f2f03ddc72bc980c