[automerger skipped] Merge "Adjust and update dumpsys meminfo output." am: 165050810b am: c2f5e33525 am: 9409ec02a6
am: 62806139df -s ours
am skip reason: change_id Ie0e7d6b938b6ee81c01191d6830f1196fa2121c1 with SHA1 08fcd7588c is in history

Change-Id: I8f2735c0723769d7ee5bb1239cdc0c5f16bf4e70