efca5c8655
This reverts commit ede8718e63.
Reason for revert: causing ANR b/223789074
Bug: 223789074
Bug: 223443781
Bug: 202507555
Change-Id: Ibd76939a345f54e8945cdd97e652f5e06e40edcb