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: 8f4662c3

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



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