Merge "Do not leak dump objects." into rvc-d1-dev am: 62c3a4f46b

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

Change-Id: Iecef31f7bf10ad97b7e0075cf302ae94e248474a