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

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



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