am 827a597d: Reconcile with ics-mr1-release

* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
tree: 1f700612e12023ffbd774406f064d5da9c2ca8e2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/