Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev am: 49a00c31

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



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