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

Merge "Add component types which a process is hosting into the proc memstats" into tm-dev am: 57e03f3b am: 37f9f851

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



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