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 am: 108b5ca2 am: cc6951c1

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



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