Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894
am: 83392f441d

Change-Id: Ia950108330b655dbd2b32cfacb580cbd9e13ad4a