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

Change-Id: I15d47b96d0b937c720eca379d34a73da5f00a6d2