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

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

Change-Id: I28fa8c8f3f0dc29c6dee440d215bfe89eeb4285e