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

Change-Id: Idb4bcdfca436af96c664fcd9c112c97f91bab15b