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: 38379465

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

Change-Id: Iee8cbcc6a344e38e84017e524c3075d4f2bfd93e