[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14983170
Change-Id: Iab060c6083c8a349be940c6c079e873774a849f5
This commit is contained in: