Merge "Adjusting paddings in ShadeHeader to allow for hover state" into...

Merge "Adjusting paddings in ShadeHeader to allow for hover state" into udc-qpr-dev am: 2be07648 am: 3889d0a1

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



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