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

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

Change-Id: Ie50492995c3f189706dc08c4f37c2f1616408268