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

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

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