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 am: 883585c4

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



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