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

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

Change-Id: Ie0eab409e3a8295ab9e07e7dd7db8699711dfaf2