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

* commit 'a72911563b0e5b21b196d40249b53975bf8d8f85':
  TimedEventQueue: improve wakelock management