Merge "Making SysUiState's QS expansion flag require shade expansion" into tm-qpr-dev am: a2f1ceff96

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

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