Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e33681 am: 5028f892

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f761098ec224c709b1f779e3e4b296f08e265a