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

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

Change-Id: Iaff7c6f0c70d89846da5ba61f027809d03d14d52