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

Change-Id: I9877fb4970735e21d31d644602e8e766ef0cf45e