Merge "Merge "Add component types which a process is hosting into the proc...

Merge "Merge "Add component types which a process is hosting into the proc memstats" into tm-dev am: 57e03f3b am: b3370fb0" into tm-d1-dev-plus-aosp am: 09188768 am: 74881b6c

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



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