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

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



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