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: Ieb1089dbc51caa49df7f178f3ca9b9ae97da2eeb