Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev am: 3ab0caf4c8 am: 0ee3df8359
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14884461 Change-Id: I825189ab2b39f0ae9650a3bc53628595cb6286db
This commit is contained in: