am 74ff66e2: am 5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev

* commit '74ff66e26a4c901922524f221414c578186f92b5':
  Cherry pick task movement changes from aosp