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 am: 6d4bbd68 -s ours

am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 76e8e047 is already in history

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

Change-Id: Ibe1c07ee1f707c05560feeb7ce5d22e9d33d8262