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

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



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