[automerger skipped] Merge "Use non-wakeup alarm for delay constraint." am: 3f9e9efe46 am: 3ade229c1c am: c5bfdd62c9 -s ours
am skip reason: Change-Id I5756bd805c68dea51b3a5aa74419b195407e1a30 with SHA-1 ca7fb4bcc0 is in history

Change-Id: Id98ebe49ef5568972f468734cc31220564eab5eb