Merge "ActivityManager: Include Private Dirty Pages in Meminfo" into main am: dff1d0ff15 am: eb4056b090

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

Change-Id: I32d33fbdb3df088afd7d09eef7cc49447bf3337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>