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

Merge "Revert "Adjusting paddings in ShadeHeader to allow for hover state"" into udc-qpr-dev am: 69976e06

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



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