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

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

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