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

Merge "[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: fdae28f7 -s ours" into sc-v2-dev-plus-aosp