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

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

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