Merge "Reland "Dismiss freeform tasks occluding keyguard in folded transitions"" into udc-qpr-dev am: eef11d84bf am: a16769bc3a

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

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