Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799a am: 59efb312 am: a6323272 am: 160d2dc5

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



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