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

Change-Id: Iac71f18a29fd9e7835e123766698c99f3554975d