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

Change-Id: Ia42e9efc9fdea85566811dbeb01ef5693dee71dd