This reverts commit 843460d1. Bug: 38183197 Test: manual while running dumpDebugInfo continuously in the background Change-Id: Ife3fb2970f58b8c8049bbe878c6a7728d1299d57