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 am: 6b2ad2a1

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



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