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

Change-Id: I62092cba303ea8d07f42f99d420542bea231a2ca