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 am: af523e3a

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



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