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

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

Change-Id: I414d46f44e4755ce048c82e69225c5660ef96ffc