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: 0d7a4e5c am: 16aa5e06

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



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