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

* commit 'dac298005ce3c1361e27bb740e4b518765d43d77':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON