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

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

Change-Id: I3a1f49a2124f89be10c31cdfa61310b425cefd0a