Merge "Fixing setting mQsExpandImmediate state in correct context in split...

Merge "Fixing setting mQsExpandImmediate state in correct context in split shade" into tm-dev am: b5310919 am: fed031ca

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



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