[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a am: 2b7b72968e -s ours am: 5256a6fdb7 -s ours
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 468aeab7e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641
Change-Id: I63dad5f2f67df23d2ae106277ec110431aa437f5
This commit is contained in: