Merge "Update scrims when changing quick settings clip, fix clipping bounds in...

Merge "Update scrims when changing quick settings clip, fix clipping bounds in split shade" into sc-v2-dev am: 6b484c26 am: eafa4b36

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

Change-Id: I4776379ad990dc1151692818765407f04ced061f