Merge "Fix dumpDebugInfo blocked and phone hanging" am: 7cde9f29b4 am: 95873b656c am: 0b186a3b43

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

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