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: b3370fb0 am: fe7e4cb0 am: f3686d92

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



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