Merge "Avoid recursion for leaf task fragment in freeform mode" into main am: 30f6d64786 am: c6caf1223e

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

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