Merge "Merge "Only disallow QS expansion while keyboard is visible" into...

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

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



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