am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"

* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON