[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am:...

[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5f am: 5518a714 am: cb8e4e8d am: 8ebf5ba9 am: 2b7b7296 -s ours

am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 468aeab7 is already in history

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

Change-Id: Ib9b1a4c45844028e95a4cf9b5701231e79b78d3b