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

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

Change-Id: I6e90354a0b2b74639e1fe80f391c69e9b7756b15