[automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours am: 78ad33b608 -s ours am: 691b69364d -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/+/14982320
Change-Id: I39ca33bc59c432aba0c5bcc8b0519f4ec9d04349
This commit is contained in: