Merge "Merge "Fix side effects of trace-ipc and dumpheap commands" into rvc-dev am: 0e1054f01e am: ec280a207c" into sc-dev am: 953c65e271
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982902 Change-Id: I9a2430880fe497046ab56ebd39f42de01fd6179c
This commit is contained in: