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

Change-Id: I83ebdc9402e98bd8329338a165283e6cc4809b92