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: bf199e8c am: af439faa

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

Change-Id: I11f6403554d248e9e5b74f0aaf828305dbadae05