Merge "Fix QSPanel horizontal layout issue after unfolding" into tm-qpr-dev am: ff7317100a

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

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