am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev

* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
  Fix scrubbing behavior on keyguard music transport