Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev am:...

Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev am: 3ab0caf4 am: 134f5abb

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

Change-Id: I68bf29de0dafbcd1d21ecea0a46597eaf9b1410f