Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3

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

Change-Id: I2cd91b0de1757c122625b2535a10b5092d57d42a