Merge "Merge "Remove divider height before first view in shade" into tm-dev...

Merge "Merge "Remove divider height before first view in shade" into tm-dev am: 96aa1654 am: 790b21f3 am: 4df1a52e" into tm-qpr-dev-plus-aosp am: 7da411c3

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



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