Merge "[automerger skipped] Fix side effects of trace-ipc and dumpheap...

Merge "[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5f am: 5518a714 am: cb8e4e8d am: 8ebf5ba9 am: 1bd2f527 -s ours am: 6be94c05 -s ours am: 80c0cdab -s ours" into sc-v2-dev-plus-aosp