Merge "Reset shade over scroll state when split shade enabled changes" into...

Merge "Reset shade over scroll state when split shade enabled changes" into tm-qpr-dev am: ca9896a7 am: ea8f6faf

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



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