27f9559203
This reverts commit efca5c8655.
Reason for revert: ANR no longer happening
Bug: 223789074
Bug: 223443781
Bug: 202507555
Change-Id: I03bfe8642ef4ed0f9e8fbd543141d39c66375604