[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: ba354cf9 am: 4d56d309 am: 772110eb -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: I2b76a13149a6ae819d6025ed3df56dd5b116df32