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

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

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