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

[automerger skipped] Merge "Do not leak dump objects." into rvc-dev am: 406dd94d am: e0d07152 am: 6fc6a67e am: 9841667f -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/+/12316627

Change-Id: I80c7a95e3ba8e371861292da262ec8319d1e5715