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