Merge "Revert^2: Log the process hosting component types in...

Merge "Revert^2: Log the process hosting component types in ProcessMemorySnapshot" into udc-dev am: 9e10dc5e am: 0b89123e

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



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