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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2b8b675e460284ca4489ed4e08fe8695b5d816