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

Change-Id: Ie7bb379ea9f99aa630dba3fabb6afd931beed747