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

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



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