Merge "Do not reposition leaf tasks from grandparent tasks" into rvc-qpr-dev am: b842240b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12208321

Change-Id: Iae5021aa8041386c88218e0f155a13ba2ba7b2d4