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: f5c7903b am: a94f3df3 am: 0fcef1f6

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



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