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

Change-Id: Iabeff5f57eac74d4a06815568a54e823714d5f2f