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 am: 9e9da04e -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/+/14982641

Change-Id: Iae3aebf89b21d7fb1d217982d65e2e4dd3b494f7