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

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



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