Merge "Uses static top padding for lockscreen notification space" into tm-dev...

Merge "Uses static top padding for lockscreen notification space" into tm-dev am: fe726093 am: 370fe57b

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



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