Merge "Fixing customizer scroll in collapsed split shade" into sc-v2-dev am: 1c7308511f am: e64f4fa853

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

Change-Id: Id321e851f34207230defa3406a92653bda5f81f9