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

[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9 -s ours am: 67fcd269 -s ours am: d5745e32 -s ours am: 490b2477 -s ours am: 7ab155c9 -s ours am: 6f366144 -s ours am: 18585507 -s ours

am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5f is already in history

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

Change-Id: Ie3000fa73cdae3fc9b0e0241909b86d3b2ffd0c0