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: 0db987a3 am: 04281c4c am: 893f283d

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



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