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: fb2a1d2b

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

Change-Id: If10a3df904d533cd60cabbe9738b609eaf716b85