Merge "Merge "Fixing setting mQsExpandImmediate state in correct context in split shade" into tm-dev am: b5310919 am: 8f4662c3 am: a18965d4" into tm-qpr-dev-plus-aosp am: d93909de

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



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