Merge "Fixing mQsVisible state in split shade" into tm-qpr-dev am: a502a821 am: 26e95ad2

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



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