Merge "Fix qs rows count on foldables" into tm-qpr-dev am: 856c35959f am: 710bc88145

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

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