Merge "Hold Display Suspend blocker when going to Doze" into qt-qpr1-dev am: d514ae457d
am: 803814fe46

Change-Id: Iefad47b90e8610ef1bb9a4d30de5e513232da1a6