Merge "Updating QS state to default when going from or to split shade" into tm-dev am: 9568bd96

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



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