Merge "Merge "Fix side effects of trace-ipc and dumpheap commands" into...

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

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

Change-Id: I17dac4a59ddb46e376489856b553cafbfc55d760