Merge "Fix incorrect QS paddings after relayout" into sc-v2-dev am: 26409be79e am: 990a14ddb8

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

Change-Id: I22aa8c4662b07bf731ba02053282ced59b50676e