Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev am: 3ab0caf4 am: 0ee3df83 am: b57d292b

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

Change-Id: Ifb663f27f9edd32080ef01a6dbe67e18119936cf