[automerger skipped] DO NOT MERGE Fixed the padding of quick settings am:...

[automerger skipped] DO NOT MERGE Fixed the padding of quick settings am: a501b9b9 am: 716740e3 -s ours am: 80de7f49 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3f6532c073d0290b29e645a9ce8972c761edc399