Merge "Fix dumpDebugInfo blocked and phone hanging" am: 7cde9f29b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2229637

Change-Id: I2fee48e429d0627ac8e1a3811e65d326643afcd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>