Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b28 am: 40001a69 am: ca9ef128 Change-Id: I4ab51f547b46f579298d4eb8f6ab88eb76a4866a