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 am: d609801b

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



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