Merge "Merge "Adjust QS side spacing in split shade according to specs" into...

Merge "Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799a am: 59efb312 am: 9f08e0ba" into tm-qpr-dev-plus-aosp am: 74c42639

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



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