Merge "Change freeform activity occluding keyguard to fullscreen" into udc-dev...

Merge "Change freeform activity occluding keyguard to fullscreen" into udc-dev am: d48052dd am: c1e825ac

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



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