Merge "Updated the paddings of quick settings to match notifications" into...

Merge "Updated the paddings of quick settings to match notifications" into rvc-dev am: 2c1bfedd am: 6b872b9c am: 0a6f733a am: d8571bcf

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

Change-Id: I9c5407b2eceb9d2cc5b4f8bab330ca175b0774a3