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

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

Change-Id: I59bdb8e449dd994d9b742a52ad512424abe195c7