Merge "Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b28 am: 83392f44" into qt-qpr1-dev-plus-aosp