Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86fee am: 23cdf1a4" into qt-qpr1-dev-plus-aosp