Merge "Change freeform activity occluding keyguard to fullscreen" into udc-dev am: d48052dd05 am: c1e825ac8c

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

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