Merge "Reduce notification section gap on lockscreen; increase gap when going...

Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74 am: d93b1210

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



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