Merge changes from topic "qs_expanded_state_fix" into tm-qpr-dev am: 6bcb40d0 am: d6ae817d

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



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