Merge "Temporary remove dump which is causing deadlocks in AM." into tm-dev am: 4b1a9e35 am: 74995c98

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17023613

Change-Id: I9b95495e82f7171e9ae94e0d95d2acf588bc672f