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

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



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