Merge "Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799a am: d02d2e7a" into tm-d1-dev-plus-aosp am: 1b8ba882

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



Change-Id: I45c2a504a86d391f3541c2f521e51a716b94c143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>