Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1
am: 41718e2413

Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b