Merge "Increasing space between scrim and notifications bottom in split shade" into tm-dev am: 078a1f71 am: 7b201ec2

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



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