Merge "Enter quick doze with non-wakeup alarm." into qt-qpr1-dev
am: 795ef47130

Change-Id: I0c45525e4d7ff55de632b8d98a4e8aa993ea86d6