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

Merge "[automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588 -s ours am: acfbbafa -s ours am: 83a085e8 -s ours am: 78ad33b6 -s ours am: 691b6936 -s ours am: aa70826c -s ours" into sc-v2-dev-plus-aosp