Merge "Merge "Don't intercept touches when the qs scrollview can't scroll"...

Merge "Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev am: f27737a2 am: 3162f432" into rvc-d1-dev-plus-aosp am: 281a63c0 am: 6476ad1d

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

Change-Id: Ie3fbec52bc91f785aebbee005f5c12ac9dfb200e