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 am: e22d99c8

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



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