Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe
am: 1a5d1e7252

Change-Id: Ib4f9fb77799574768864ad9fccca072b2f680de2