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

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

Change-Id: Ib2434e4bcdf182a37d5b864c6191fe5df86b2fc4