Merge "ActivityManager: Include Private Dirty Pages in Meminfo" into main am: dff1d0ff15 am: 536524c058 am: 2cc1e7b8fa

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

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