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

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

Change-Id: I7ee33c05511b22c1a3f22fb5864b7d1ffd38098e