Merge "Fix dumping of heap memory." am: af7c3d5873 am: 8584d41613

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1365229

Change-Id: Id18cb0e2d2f3e776a42b566c4a1af2e250890896