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

Change-Id: I27fe780d2688c100f67a7291b7db40761348f4ba