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 am: 9e416c80

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

Change-Id: I5c99e9c59ea5b446f53ab4206f3e1108653731a6