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 am: 25564010 am: e8936a40

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

Change-Id: If0b7315fb7eb24c481f17c789aa66a1d13ce31db