Revert "Hold Display suspend blocker until doze starts"

This reverts commit 93e16472.

Reason for revert: This is causing wake lock to remain held
while screen is off

Bug: 139875245
Change-Id: I0ff714a0cf2496d141d355de68761ab720a09539