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: 0f481b70 am: e60cab4a

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



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