[automerger skipped] Merge "Enter quick doze with non-wakeup alarm." into qt-qpr1-dev am: 795ef47130
am:ae089b82bf-s ours am skip reason: change_id I98bf4131b7b4a1006e37aa42bcbc7dda7e137d1d with SHA1ecf98fb416is in history Change-Id: I6485554c2f88b21e911f49f728339c0734eac35d
This commit is contained in: