Merge "Remove divider height before first view in shade" into tm-dev am: 96aa1654 am: 4e5923b7

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



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