Merge "Avoid recursion for leaf task fragment in freeform mode" into main am:...

Merge "Avoid recursion for leaf task fragment in freeform mode" into main am: 30f6d647 am: c6caf122 am: 4625943b am: c4d7ee11 am: 889ad7c5

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



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