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: a04c8c13

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



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