Merge "Ensure that the keyguard container is always below message area." into sc-v2-dev am: 8a265b2187

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

Change-Id: I69ec2e0b2b78649b65e9e8f2eccaf1401318df56