[automerger skipped] Merge "Do not leak dump objects." into rvc-d1-dev am:...

[automerger skipped] Merge "Do not leak dump objects." into rvc-d1-dev am: 62c3a4f4 am: 143f714e am: 4196b881 -s ours

am skip reason: Change-Id I9c1737647d762f478c0e452e5b72f98ec3d43c28 with SHA-1 6e1b4a42 is in history

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

Change-Id: Ib75fd043e28ee9b3f5ec690c9ee0af3e510d1e3a