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

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

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

Change-Id: I4fc39ca4a643d066c692c196ee66f0dc7659f77a