Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev am: f27737a29d

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

Change-Id: Ie545523a972f1da5ed2ec315f7c9fd923b5d0581