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 am: d36f24be am: 6cf859ca

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



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