[automerger skipped] Merge "Do not reposition leaf tasks from grandparent...

[automerger skipped] Merge "Do not reposition leaf tasks from grandparent tasks" into rvc-qpr-dev am: b842240b am: 00e4d91d -s ours

am skip reason: Change-Id Iffde4ddfbe315d0226961f7d98a897b34062c376 with SHA-1 8b255473 is in history

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

Change-Id: I74b82117a63d5ec6da184320e49a12e29c62d0ee