Merge "Fix side effects of trace-ipc and dumpheap commands" into rvc-dev am: 0e1054f0

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

Change-Id: I52cbcd6b7f63706a83e5108537699b4595c3697f