am 5b5f76dc: am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev

* commit '5b5f76dcb29792830baca1f25e51a732b80241df':
  TimedEventQueue: improve wakelock management