Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e336819c am: 5028f8923a am: 4b5690b9bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf1982408ca64ec87dcc15849adbba4b7c8a6913