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

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

Change-Id: I6f6e82e125c71777c127b532ffbbb63696b0afa7