Merge "Only manipulate leashes for leaf-tasks when adapting to legacy" into...

Merge "Only manipulate leashes for leaf-tasks when adapting to legacy" into tm-qpr-dev am: 4c287406

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



Change-Id: I3286186efd46d57add45b29a7ac43d58e26b3f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>