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

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

Change-Id: I93f99b99a9db6a5922f0cc666f0b327689e1ea27