Revert "aosp-stable: Fixed an ANR bug"

This reverts commit b3d54d7f1716916bed8e52db03edc8039e87e80b.