[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours am: 67fcd26956 -s ours am: d5745e3249 -s ours am: 490b2477b8 -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: Idc3c4d490c34b399cf9a85bd42e133fade8a019f
This commit is contained in: