Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b

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

Change-Id: If18870b493379666879316947b2f1664c1a4845f