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

[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 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/+/14982320

Change-Id: I1309b2f68a875ce6cf2327b08ccd29f9a4a51ea2