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

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

Change-Id: I8ba04aba21903b71616a8d9cde18f00f5c8fb8f3